From: Florian Müllner <fmuellner@gnome.org>
Date: Fri, 5 Oct 2012 13:56:24 +0000 (+0200)
Subject: userMenu: Ignore 'lock-enabled' setting for user switching
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~5666
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=4f66f096ff2d31da7bf0fae42a5d2490640ad69d;p=gnome-shell.git

userMenu: Ignore 'lock-enabled' setting for user switching

The preference controls whether the screen should be locked when
the screensaver is activated, not whether the screen should be
locked at all. In particular after having switched to a different
user, log out should not automatically switch back to the unlocked
session, so always activate the lock when user switching.

https://bugzilla.gnome.org/show_bug.cgi?id=685536
---

diff --git a/js/ui/userMenu.js b/js/ui/userMenu.js
index cfa105ae8..6eb445f97 100644
--- a/js/ui/userMenu.js
+++ b/js/ui/userMenu.js
@@ -824,8 +824,7 @@ const UserMenuButton = new Lang.Class({
     _onLoginScreenActivate: function() {
         this.menu.close(BoxPointer.PopupAnimation.NONE);
         Main.overview.hide();
-        if (this._screenSaverSettings.get_boolean(LOCK_ENABLED_KEY))
-            Main.screenShield.lock(false);
+        Main.screenShield.lock(false);
         Gdm.goto_login_session_sync(null);
     },